Fix mapbar.

git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@4707 f51c46e8-681c-474f-0cfe-069cfd0219fb

diff --git a/gpsbabel/mapbar_track.cc b/gpsbabel/mapbar_track.cc
index daa24ced3766ddc777c0769ca37c7d39c1ca448f..05f35abfdb2a64c53ea9ab5389e45de6d819bba7 100644 (file)
--- a/gpsbabel/mapbar_track.cc
+++ b/gpsbabel/mapbar_track.cc
@@ -88,14 +88,11 @@ mapbar_track_read(void)
   (void) read_datetime(); // start_time currently unused
   (void) read_datetime(); // end_time currently unused
 
-  char name[200] = {0};
+  ushort name[200] = {0};
   gbfread((void*)name, 1, 200, fin);
   // At this point, name is a UCS-16 encoded, zero terminated string.
-  // All our internals use UTF-8 encoding, so convert now.
-  int olen = strlen(name);
-
-  QScopedPointer<char, QScopedPointerPodDeleter>rte_name (cet_str_uni_to_utf8((const short int*) name, olen));
-  track->rte_name = rte_name.take();
+  // All our internals use Qt encoding, so convert now.
+  track->rte_name = QString().fromUtf16(name);
 
   // skip two pair waypoint
   gbfseek(fin, 8*4, SEEK_CUR);